Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Incoming stamina damage while in stamcrit has diminishing returns applied #3788

Merged
merged 2 commits into from
Jun 13, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#2987
Original PR: tgstation/tgstation#83445

About The Pull Request

After being put in stamcrit, future incoming stamina damage has "diminishing returns" applied*.

The formula looks like ceil(sqrt(amount of stamina damage) / 2) - times you have taken stamina damage in stamcrit.

This means eventually stamina based damage will do less than zero damage, and thus, not contribute to keeping stamcrit active.

Very, very low amounts of stamina damage (such as from chems) contribute to DR 1/20th the amount.

*Note, this is not real diminishing returns because making it real diminishing returns would be pointless, you are capped to 120 stamina damage so 99.99% of the time you take stam damage while in stam crit you're already capped. This is just faking the effect.

In its current stat this means that a stun baton will stop being able to keep someone in stamcrit after the 5th hit, and a stock disabler will stop being able to keep someone in stamcrit after the 4th hit.

Why It's Good For The Game

Mostly just an experiment. I don't imagine it will shake up much about the baton situation in its current state.

There's also no grace period after getting UP - so like you can just be stamcritted right after anyways. Maybe there should be one? Food for thought.

And yes of course you can just space out your hits, you're not clever for thinking about that

Changelog

🆑 Melbert
balance: Taking stamina damage in stamcrit has diminishing returns associated, meaning you cannot be infinitely stamcrit.
/:cl:

…turns applied [MDB IGNORE] (#2987)

* Incoming stamina damage while in stamcrit has diminishing returns applied

* This was not even used

* Update death_consequences_trauma.dm

---------

Co-authored-by: MrMelbert <[email protected]>
Co-authored-by: Mal <[email protected]>
@Iajret Iajret merged commit 66c341c into master Jun 13, 2024
26 checks passed
@Iajret Iajret deleted the upstream-mirror-2987 branch June 13, 2024 09:37
AnywayFarus added a commit that referenced this pull request Jun 13, 2024
Iajret pushed a commit that referenced this pull request Jul 16, 2024
…adouts [MDB IGNORE] (#3788)

Adds an assistant preview outfit for previewing assistant loadouts (#84861)

The loadout PR changed it so the assistant's loadout preview used an
outfit called "Assistant - Consistent" to keep it a consistent grey,
only issue is that the consistent outfit does not consider the user's
suit preference so it'd stay as a grey jumpsuit even if skirts were
preferred, this PR adds a new assistant outfit called "Assistant -
Preview" to be used for loadout previews.

I opted against adding the suit check to the consistent outfit instead
since as far as I can see it is meant to stay at a consistent grey suit
for mob spawns, icons and unit tests and that could end up creating more
issues otherwise.

https://github.com/tgstation/tgstation/assets/66234359/502cd0c5-ec51-43bf-bbc2-6f5435047d2a

Fixes tgstation/tgstation#83908

It fixes an issue where only assistant jumpsuits were shown on the
character preview if you have assistant selected to on, regardless of
your suit preferences.

:cl: Hardly3D
fix: Added a preview assistant outfit, allowing assistant jumpskirts to
be previewed again on character preferences.
/:cl:

Co-authored-by: Hardly3D <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants